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.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.49 by root, Sun Apr 9 22:26:51 2006 UTC

… …
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 Crossfire::Client;
11#our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
16sub feed_sdl_button_down_event { } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23} 22}
24
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36 23
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
40 $self->{y} = $y; 27 $self->{y} = $y;
… …
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42
43 $self->{w} = $w;
44 $self->{h} = $h;
50} 45}
51 46
52sub focus_in { 47sub focus_in {
53 my ($widget) = @_; 48 my ($widget) = @_;
54 $FOCUS = $widget; 49 $::FOCUS = $widget;
55} 50}
56 51
57sub focus_out { 52sub focus_out {
58 my ($widget) = @_; 53 my ($widget) = @_;
59} 54}
… …
72 67
73sub button_up { 68sub button_up {
74 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
75} 70}
76 71
77sub w { $_[0]->{w} } 72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 77
83sub draw { 78sub draw {
84 my ($self) = @_; 79 my ($self) = @_;
85 80
86 glPushMatrix; 81 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 0.4;
86 glBegin GL_QUADS;
87 glVertex 0, 0;
88 glVertex $self->{w} - 1, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1;
90 glVertex 0, $self->{h} - 1;
91 glEnd;
92 }
89 glPopMatrix; 93 glPopMatrix;
90} 94}
91 95
92sub _draw { 96sub _draw {
93 my ($widget) = @_; 97 my ($self) = @_;
98
99 warn "no draw defined for $self\n";
94} 100}
95 101
96sub bbox { 102sub bbox {
97 my ($self) = @_; 103 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 104 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 108 $self->{x} = $w,
103 $self->{y} = $h 109 $self->{y} = $h
104 ) 110 )
105} 111}
106 112
113sub find_widget {
114 my ($self, $x, $y) = @_;
115
116 return $self
117 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
118 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
119
120 ()
121}
122
107sub del_parent { $_[0]->{parent} = undef } 123sub del_parent { $_[0]->{parent} = undef }
108 124
109sub set_parent { 125sub set_parent {
110 my ($self, $par) = @_; 126 my ($self, $par) = @_;
111 127
… …
128 my ($self) = @_; 144 my ($self) = @_;
129 145
130 #$self->deactivate; 146 #$self->deactivate;
131} 147}
132 148
149#############################################################################
150
151package Crossfire::Client::Widget::Container;
152
153our @ISA = Crossfire::Client::Widget::;
154
155sub new {
156 my ($class, @widgets) = @_;
157
158 my $self = $class->SUPER::new (children => []);
159 $self->add ($_) for @widgets;
160
161 $self
162}
163
164sub add {
165 my ($self, $chld, $expand) = @_;
166
167 $chld->{expand} = $expand;
168 $chld->set_parent ($self);
169
170 @{$self->{children}} =
171 sort { $a->{z} <=> $b->{z} }
172 @{$self->{children}}, $chld;
173
174 $self->size_allocate ($self->{w}, $self->{h})
175 if $self->{w}; #TODO: check for "realised state"
176}
177
178sub remove {
179 my ($self, $widget) = @_;
180
181 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
182
183 $self->size_allocate ($self->{w}, $self->{h});
184}
185
186sub find_widget {
187 my ($self, $x, $y) = @_;
188
189 $x -= $self->{x};
190 $y -= $self->{y};
191
192 my $res;
193
194 for (reverse @{ $self->{children} }) {
195 $res = $_->find_widget ($x, $y)
196 and return $res;
197 }
198
199 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
200}
201
202sub _draw {
203 my ($self) = @_;
204
205 $_->draw for @{$self->{children}};
206}
207
208#############################################################################
209
133package Crossfire::Client::Widget::Bin; 210package Crossfire::Client::Widget::Bin;
134 211
135our @ISA = Crossfire::Client::Widget::; 212our @ISA = Crossfire::Client::Widget::Container::;
136 213
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
138
139sub get { $_[0]->{child} } 214sub child { $_[0]->{children}[0] }
140
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
146 215
147sub size_request { 216sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 217 $_[0]{children}[0]->size_request if $_[0]{children}[0];
149} 218}
150 219
151sub _draw { 220sub size_allocate {
152 my ($self) = @_; 221 my ($self, $w, $h) = @_;
153 222
154 $self->{child}->draw; 223 $self->SUPER::size_allocate ($w, $h);
224 $self->{children}[0]->size_allocate ($w, $h)
225 if $self->{children}[0]
155} 226}
227
228#############################################################################
156 229
157package Crossfire::Client::Widget::Toplevel; 230package Crossfire::Client::Widget::Toplevel;
158 231
232our @ISA = Crossfire::Client::Widget::Container::;
233
234sub update {
235 my ($self) = @_;
236
237 ::refresh ();
238}
239
240sub add {
241 my ($self, $widget) = @_;
242
243 $self->SUPER::add ($widget);
244
245 $widget->size_allocate ($widget->size_request);
246}
247
248#############################################################################
249
250package Crossfire::Client::Widget::Window;
251
159our @ISA = Crossfire::Client::Widget::; 252our @ISA = Crossfire::Client::Widget::Bin::;
160 253
161use SDL::OpenGL; 254use SDL::OpenGL;
162 255
163sub add { 256sub new {
164 my ($self, $chld) = @_; 257 my ($class, $x, $y, $z, $w, $h) = @_;
165 258
166 push @{$self->{childs}}, $chld; 259 my $self = $class->SUPER::new;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170 260
171 $chld->set_parent ($self); 261 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180} 262}
181 263
182sub update { 264sub update {
183 my ($self) = @_; 265 my ($self) = @_;
184 ::refresh ();
185}
186 266
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 $self->SUPER::add ($chld);
202 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld; 267 $self->render_chld;
268 $self->SUPER::update;
215} 269}
216 270
217sub render_chld { 271sub render_chld {
218 my ($self) = @_; 272 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221 273
222 $self->{texture} = 274 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl ( 275 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw } 276 $self->{w}, $self->{h}, sub { $self->child->draw }
225 ); 277 );
226 $self->{texture}->upload;
227} 278}
228 279
229sub size_request { 280sub size_allocate {
230 my ($self) = @_; 281 my ($self, $w, $h) = @_;
231 my $chld = $self->get 282
232 or return (0, 0); 283 $self->{w} = $w;
233 $chld->size_request 284 $self->{h} = $h;
285
286 $self->child->size_allocate ($w, $h);
287
288 $self->render_chld;
234} 289}
235 290
236sub _draw { 291sub _draw {
237 my ($self) = @_; 292 my ($self) = @_;
238 293
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 294 my ($w, $h) = ($self->w, $self->h);
240 295
241 my $tex = $self->{texture} 296 my $tex = $self->{texture}
242 or return; 297 or return;
243 298
244 glEnable GL_BLEND; 299 glEnable GL_BLEND;
… …
255 310
256 glDisable GL_BLEND; 311 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D; 312 glDisable GL_TEXTURE_2D;
258} 313}
259 314
315#############################################################################
316
260package Crossfire::Client::Widget::Frame; 317package Crossfire::Client::Widget::Frame;
261 318
262our @ISA = Crossfire::Client::Widget::Bin::; 319our @ISA = Crossfire::Client::Widget::Bin::;
263 320
264use SDL::OpenGL; 321use SDL::OpenGL;
265 322
266sub size_request { 323sub size_request {
267 my ($self) = @_; 324 my ($self) = @_;
268 my $chld = $self->get 325 my $chld = $self->child
269 or return (0, 0); 326 or return (0, 0);
270 327
271 $chld->move (2, 2); 328 $chld->move (2, 2);
272 329
273 map { $_ + 4 } $chld->size_request; 330 map { $_ + 4 } $chld->size_request;
274} 331}
275 332
333sub size_allocate {
334 my ($self, $w, $h) = @_;
335
336 $self->{w} = $w;
337 $self->{h} = $h;
338
339 $self->child->size_allocate ($w - 4, $h - 4);
340 $self->child->move (2, 2);
341}
342
276sub _draw { 343sub _draw {
277 my ($self) = @_; 344 my ($self) = @_;
278 345
279 my $chld = $self->get; 346 my $chld = $self->child;
280 347
281 my ($w, $h) = $chld->size_request; 348 my ($w, $h) = $chld->size_request;
282 349
283 glBegin GL_QUADS; 350 glBegin GL_QUADS;
284 glColor 0, 0, 0; 351 glColor 0, 0, 0;
… …
289 glEnd; 356 glEnd;
290 357
291 $chld->draw; 358 $chld->draw;
292} 359}
293 360
361#############################################################################
362
294package Crossfire::Client::Widget::FancyFrame; 363package Crossfire::Client::Widget::FancyFrame;
295 364
296our @ISA = Crossfire::Client::Widget::Frame::; 365our @ISA = Crossfire::Client::Widget::Bin::;
297 366
298use SDL::OpenGL; 367use SDL::OpenGL;
299 368
300sub new { 369my @tex =
301 my ($self, $theme) = @_;
302 $self = $self->SUPER::new;
303
304 $self->{txts} = [
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 370 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 371 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
307 ];
308 $self
309
310}
311 372
312sub size_request { 373sub size_request {
313 my ($self) = @_; 374 my ($self) = @_;
375
314 my ($w, $h) = $self->get->size_request; 376 my ($w, $h) = $self->SUPER::size_request;
315 377
316 $h += $self->{txts}->[1]->{height}; 378 $h += $tex[1]->{height};
317 $h += $self->{txts}->[4]->{height}; 379 $h += $tex[4]->{height};
318 $w += $self->{txts}->[2]->{width}; 380 $w += $tex[2]->{width};
319 $w += $self->{txts}->[3]->{width}; 381 $w += $tex[3]->{width};
320
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
322 382
323 ($w, $h) 383 ($w, $h)
324} 384}
325 385
386sub size_allocate {
387 my ($self, $w, $h) = @_;
388
389 $self->SUPER::size_allocate ($w, $h);
390
391 $h -= $tex[1]->{height};
392 $h -= $tex[4]->{height};
393 $w -= $tex[2]->{width};
394 $w -= $tex[3]->{width};
395
396 $h = $h < 0 ? 0 : $h;
397 $w = $w < 0 ? 0 : $w;
398
399 $self->child->size_allocate ($w, $h);
400 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
401}
402
326sub _draw { 403sub _draw {
327 my ($self) = @_; 404 my ($self) = @_;
328 405
329 my ($w, $h) = $self->size_request; 406 my ($w, $h) = ($self->{w}, $self->{h});
330 my ($cw, $ch) = $self->get->size_request; 407 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
331 408
332 glEnable GL_BLEND; 409 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D; 410 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
336 413
337
338 my $top = $self->{txts}->[1]; 414 my $top = $tex[1];
339 glBindTexture GL_TEXTURE_2D, $top->{name}; 415 glBindTexture GL_TEXTURE_2D, $top->{name};
340 416
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS; 417 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0; 418 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height}; 419 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height}; 420 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0; 421 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd; 422 glEnd;
349 423
350 my $left = $self->{txts}->[3]; 424 my $left = $tex[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name}; 425 glBindTexture GL_TEXTURE_2D, $left->{name};
352 426
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS; 427 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height}; 428 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 429 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 430 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 431 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd; 432 glEnd;
361 433
362 my $right = $self->{txts}->[2]; 434 my $right = $tex[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name}; 435 glBindTexture GL_TEXTURE_2D, $right->{name};
364 436
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS; 437 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 438 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 439 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 440 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height}; 441 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd; 442 glEnd;
373 443
374 my $bottom = $self->{txts}->[4]; 444 my $bottom = $tex[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 445 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376 446
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS; 447 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 448 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h; 449 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h; 450 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 451 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd; 452 glEnd;
385 453
386 my $bg = $self->{txts}->[0]; 454 my $bg = $tex[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name}; 455 glBindTexture GL_TEXTURE_2D, $bg->{name};
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 457 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390 459
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width}; 460 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height}; 461 my $rep_y = $ch / $bg->{height};
395 462
396 glBegin GL_QUADS; 463 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 464 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; 465 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; 466 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; 467 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd; 468 glEnd;
402
403 $self->get->draw;
404 469
405 glDisable GL_BLEND; 470 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 471 glDisable GL_TEXTURE_2D;
472
473 $self->child->draw;
474
407} 475}
476
477#############################################################################
408 478
409package Crossfire::Client::Widget::Table; 479package Crossfire::Client::Widget::Table;
410 480
411our @ISA = Crossfire::Client::Widget::Bin::; 481our @ISA = Crossfire::Client::Widget::Bin::;
412 482
413use SDL::OpenGL; 483use SDL::OpenGL;
414 484
415sub add { 485sub add {
416 my ($self, $x, $y, $chld) = @_; 486 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x]; 487 my $old_chld = $self->{children}[$y][$x];
418 488
419 $self->{childs}[$y][$x] = $chld; 489 $self->{children}[$y][$x] = $chld;
420 $chld->set_parent ($self); 490 $chld->set_parent ($self);
421 $self->update; 491 $self->update;
422} 492}
423 493
424sub max_row_height { 494sub max_row_height {
425 my ($self, $row) = @_; 495 my ($self, $row) = @_;
426 496
427 my $hs = 0; 497 my $hs = 0;
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 498 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
429 my $c = $self->{childs}->[$row]->[$xi]; 499 my $c = $self->{children}->[$row]->[$xi];
430 if ($c) { 500 if ($c) {
431 my ($w, $h) = $c->size_request; 501 my ($w, $h) = $c->size_request;
432 if ($hs < $h) { $hs = $h } 502 if ($hs < $h) { $hs = $h }
433 } 503 }
434 } 504 }
… …
437 507
438sub max_col_width { 508sub max_col_width {
439 my ($self, $col) = @_; 509 my ($self, $col) = @_;
440 510
441 my $ws = 0; 511 my $ws = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 512 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
443 my $c = ($self->{childs}->[$yi] || [])->[$col]; 513 my $c = ($self->{children}->[$yi] || [])->[$col];
444 if ($c) { 514 if ($c) {
445 my ($w, $h) = $c->size_request; 515 my ($w, $h) = $c->size_request;
446 if ($ws < $w) { $ws = $w } 516 if ($ws < $w) { $ws = $w }
447 } 517 }
448 } 518 }
… …
452sub size_request { 522sub size_request {
453 my ($self) = @_; 523 my ($self) = @_;
454 524
455 my ($hs, $ws) = (0, 0); 525 my ($hs, $ws) = (0, 0);
456 526
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
458 $hs += $self->max_row_height ($yi); 528 $hs += $self->max_row_height ($yi);
459 } 529 }
460 530
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 531 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
462 my $wm = 0; 532 my $wm = 0;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 533 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
464 $wm += $self->max_col_width ($xi) 534 $wm += $self->max_col_width ($xi)
465 } 535 }
466 if ($ws < $wm) { $ws = $wm } 536 if ($ws < $wm) { $ws = $wm }
467 } 537 }
468 538
… …
471 541
472sub _draw { 542sub _draw {
473 my ($self) = @_; 543 my ($self) = @_;
474 544
475 my $y = 0; 545 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 546 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
477 my $x = 0; 547 my $x = 0;
478 548
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 549 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
480 550
481 my $c = $self->{childs}->[$yi]->[$xi]; 551 my $c = $self->{children}->[$yi]->[$xi];
482 if ($c) { 552 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request 553 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c; 554 $c->draw if $c;
485 } 555 }
486 556
… …
489 559
490 $y += $self->max_row_height ($yi); 560 $y += $self->max_row_height ($yi);
491 } 561 }
492} 562}
493 563
564#############################################################################
565
494package Crossfire::Client::Widget::VBox; 566package Crossfire::Client::Widget::VBox;
495 567
496our @ISA = Crossfire::Client::Widget::Bin::; 568our @ISA = Crossfire::Client::Widget::Container::;
497 569
498use SDL::OpenGL; 570use SDL::OpenGL;
499 571
500sub add {
501 my ($self, $chld) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506
507sub size_request { 572sub size_request {
508 my ($self) = @_; 573 my ($self) = @_;
509 574
510 my ($hs, $ws) = (0, 0); 575 my @alloc = map [$_->size_request], @{$self->{children}};
576
577 (
578 (List::Util::max map $_->[0], @alloc),
579 (List::Util::sum map $_->[1], @alloc),
580 )
581}
582
583sub size_allocate {
584 my ($self, $w, $h) = @_;
585
586 $self->w ($w);
587 $self->h ($h);
588
589 my $exp;
590 my @oth;
591 # find expand widget
511 for (@{$self->{childs} || []}) { 592 for (@{$self->{children}}) {
593 if ($_->{expand}) {
594 $exp = $_;
595 last;
596 }
597 push @oth, $_;
598 }
599
600 my ($ow, $oh);
601
602 # get sizes of other widgets
603 for (@oth) {
512 my ($w, $h) = $_->size_request; 604 my ($w, $h) = $_->size_request;
513 $hs += $h; 605 $oh += $h;
514 if ($ws < $w) { $ws = $w } 606 if ($ow < $w) { $ow = $w }
515 } 607 }
516 608
517 return ($ws, $hs); 609 my $y = 0;
518}
519
520sub _draw {
521 my ($self) = @_;
522
523 my ($x, $y);
524 for (@{$self->{childs} || []}) { 610 for (@{$self->{children}}) {
525 $_->move (0, $y, 0); #TODO: move to size_request 611 $_->move (0, $y);
526 $_->draw; 612
613 if ($_ == $exp) {
614 $_->size_allocate ($w, $h - $oh);
615 $y += $h - $oh;
616 } else {
527 my ($w, $h) = $_->size_request; 617 my ($cw, $h) = $_->size_request;
618 $_->size_allocate ($w, $h);
528 $y += $h; 619 $y += $h;
620 }
529 } 621 }
530} 622}
623
624#############################################################################
531 625
532package Crossfire::Client::Widget::Label; 626package Crossfire::Client::Widget::Label;
533 627
534our @ISA = Crossfire::Client::Widget::; 628our @ISA = Crossfire::Client::Widget::;
535 629
… …
579 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 674 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name}; 676 glBindTexture GL_TEXTURE_2D, $tex->{name};
583 677
584 glColor 1, 1, 1, 0.6; # TODO color 678 glColor 1, 0, 0, 1; # TODO color
585 679
586 glBegin GL_QUADS; 680 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex 0 , 0; 681 glTexCoord 0, 0; glVertex 0 , 0;
588 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 682 glTexCoord 0, 1; glVertex 0 , $tex->{height};
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 683 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
592 686
593 glDisable GL_BLEND; 687 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D; 688 glDisable GL_TEXTURE_2D;
595} 689}
596 690
691#############################################################################
692
597package Crossfire::Client::Widget::TextEntry; 693package Crossfire::Client::Widget::TextEntry;
598 694
599our @ISA = Crossfire::Client::Widget::Label::; 695our @ISA = Crossfire::Client::Widget::Label::;
600 696
601use SDL; 697use SDL;
… …
619 $text .= chr $uni; 715 $text .= chr $uni;
620 } 716 }
621 $self->set_text ($text); 717 $self->set_text ($text);
622} 718}
623 719
624 720#############################################################################
625# XXX: TextView isn't neccessary with pango multiline text rendering
626package Crossfire::Client::Widget::TextView;
627
628use strict;
629
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL;
633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_;
637 my $self = $class->SUPER::new ();
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646}
647
648#sub render_lines {
649# my ($self) = @_;
650#
651# $self->{txt_lines} = [];
652#
653# for (@{$self->{lines}}) {
654# push @{$self->{txt_lines}},
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# }
657#}
658
659sub add_line {
660 my ($self, $line) = @_;
661 push @{$self->{lines}}, $line;
662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687
688 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
692 glTexCoord 1, 0; glVertex $tex->{width}, $y;
693 glEnd;
694}
695
696sub _draw {
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711}
712 721
713package Crossfire::Client::Widget::MapWidget; 722package Crossfire::Client::Widget::MapWidget;
714 723
715use strict; 724use strict;
716 725
… …
725sub key_down { 734sub key_down {
726 print "MAPKEYDOWN\n"; 735 print "MAPKEYDOWN\n";
727} 736}
728 737
729sub key_up { 738sub key_up {
739}
740
741sub size_request {
742
743}
744
745sub size_allocate {
730} 746}
731 747
732sub _draw { 748sub _draw {
733 my ($self) = @_; 749 my ($self) = @_;
734 750
… …
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 892 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877 $::CONN->send ("command run_stop"); 893 $::CONN->send ("command run_stop");
878 } 894 }
879} 895}
880 896
897#############################################################################
898
881package Crossfire::Client::Widget::Animator; 899package Crossfire::Client::Widget::Animator;
882 900
883use SDL::OpenGL; 901use SDL::OpenGL;
884 902
885our @ISA = Crossfire::Client::Widget::Bin::; 903our @ISA = Crossfire::Client::Widget::Bin::;
886 904
887sub moveto { 905sub moveto {
888 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
889 907
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 909 $self->{speed} = 0.2;
892 $self->{time} = 1; 910 $self->{time} = 1;
893 911
894 ::animation_start $self; 912 ::animation_start $self;
895} 913}
896 914
… …
912sub _draw { 930sub _draw {
913 my ($self) = @_; 931 my ($self) = @_;
914 932
915 glPushMatrix; 933 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 934 glRotate $self->{time} * 10000, 0, 1, 0;
917 $self->{child}->draw; 935 $self->{children}[0]->draw;
918 glPopMatrix; 936 glPopMatrix;
919} 937}
920 938
9211; 9391;
922 940

Diff Legend

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